Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BP: release/v5 <- #118] rename: router -> packetforward #120

Merged
merged 2 commits into from
Oct 11, 2023
Merged

[BP: release/v5 <- #118] rename: router -> packetforward #120

merged 2 commits into from
Oct 11, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 11, 2023

This is an automatic backport of pull request #118 done by Mergify.
Cherry-pick of 47f2ae0 has failed:

On branch mergify/bp/release/v5/pr-118
Your branch is up to date with 'origin/release/v5'.

You are currently cherry-picking commit 47f2ae0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   middleware/packet-forward-middleware/README.md
	modified:   middleware/packet-forward-middleware/docs/integration.md
	renamed:    middleware/packet-forward-middleware/router/types/expected_keepers.go -> middleware/packet-forward-middleware/packetforward/types/expected_keepers.go
	renamed:    middleware/packet-forward-middleware/router/types/forward.go -> middleware/packet-forward-middleware/packetforward/types/forward.go
	renamed:    middleware/packet-forward-middleware/router/types/genesis.go -> middleware/packet-forward-middleware/packetforward/types/genesis.go
	renamed:    middleware/packet-forward-middleware/router/types/keys.go -> middleware/packet-forward-middleware/packetforward/types/keys.go
	renamed:    middleware/packet-forward-middleware/router/types/params.go -> middleware/packet-forward-middleware/packetforward/types/params.go
	deleted:    middleware/packet-forward-middleware/proto/router/v1/genesis.proto
	deleted:    middleware/packet-forward-middleware/proto/router/v1/query.proto
	deleted:    middleware/packet-forward-middleware/router/client/cli/cli.go
	deleted:    middleware/packet-forward-middleware/router/ibc_middleware.go
	deleted:    middleware/packet-forward-middleware/router/keeper/genesis.go
	deleted:    middleware/packet-forward-middleware/router/keeper/grpc_query.go
	deleted:    middleware/packet-forward-middleware/router/keeper/keeper.go
	deleted:    middleware/packet-forward-middleware/router/keeper/params.go
	deleted:    middleware/packet-forward-middleware/router/module.go
	deleted:    middleware/packet-forward-middleware/router/module_test.go
	deleted:    middleware/packet-forward-middleware/router/types/forward_test.go
	deleted:    middleware/packet-forward-middleware/router/types/genesis.pb.go
	deleted:    middleware/packet-forward-middleware/router/types/query.pb.go
	deleted:    middleware/packet-forward-middleware/router/types/query.pb.gw.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   middleware/packet-forward-middleware/Makefile
	both modified:   middleware/packet-forward-middleware/packetforward/client/cli/cli.go
	both modified:   middleware/packet-forward-middleware/packetforward/ibc_middleware.go
	both modified:   middleware/packet-forward-middleware/packetforward/keeper/genesis.go
	both modified:   middleware/packet-forward-middleware/packetforward/keeper/grpc_query.go
	both modified:   middleware/packet-forward-middleware/packetforward/keeper/keeper.go
	both modified:   middleware/packet-forward-middleware/packetforward/keeper/params.go
	both modified:   middleware/packet-forward-middleware/packetforward/module.go
	both modified:   middleware/packet-forward-middleware/packetforward/module_test.go
	both modified:   middleware/packet-forward-middleware/packetforward/types/forward_test.go
	both modified:   middleware/packet-forward-middleware/packetforward/types/genesis.pb.go
	both modified:   middleware/packet-forward-middleware/packetforward/types/query.pb.go
	both modified:   middleware/packet-forward-middleware/packetforward/types/query.pb.gw.go
	both modified:   middleware/packet-forward-middleware/proto/packetforward/v1/genesis.proto
	both modified:   middleware/packet-forward-middleware/proto/packetforward/v1/query.proto
	both modified:   middleware/packet-forward-middleware/scripts/protocgen.sh
	both modified:   middleware/packet-forward-middleware/test/mock/bank_keeper.go
	both modified:   middleware/packet-forward-middleware/test/mock/channel_keeper.go
	both modified:   middleware/packet-forward-middleware/test/mock/distribution_keeper.go
	both modified:   middleware/packet-forward-middleware/test/mock/transfer_keeper.go
	both modified:   middleware/packet-forward-middleware/test/setup.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@Reecepbcups @mergify
rename: router -> packetforward (#118)
50c5c46 
* rename: `router` -> `packetforward`

* use RouterKey for the Module keys

(cherry picked from commit 47f2ae0)

# Conflicts:
#	middleware/packet-forward-middleware/Makefile
#	middleware/packet-forward-middleware/packetforward/client/cli/cli.go
#	middleware/packet-forward-middleware/packetforward/ibc_middleware.go
#	middleware/packet-forward-middleware/packetforward/keeper/genesis.go
#	middleware/packet-forward-middleware/packetforward/keeper/grpc_query.go
#	middleware/packet-forward-middleware/packetforward/keeper/keeper.go
#	middleware/packet-forward-middleware/packetforward/keeper/params.go
#	middleware/packet-forward-middleware/packetforward/module.go
#	middleware/packet-forward-middleware/packetforward/module_test.go
#	middleware/packet-forward-middleware/packetforward/types/forward_test.go
#	middleware/packet-forward-middleware/packetforward/types/genesis.pb.go
#	middleware/packet-forward-middleware/packetforward/types/query.pb.go
#	middleware/packet-forward-middleware/packetforward/types/query.pb.gw.go
#	middleware/packet-forward-middleware/proto/packetforward/v1/genesis.proto
#	middleware/packet-forward-middleware/proto/packetforward/v1/query.proto
#	middleware/packet-forward-middleware/scripts/protocgen.sh
#	middleware/packet-forward-middleware/test/mock/bank_keeper.go
#	middleware/packet-forward-middleware/test/mock/channel_keeper.go
#	middleware/packet-forward-middleware/test/mock/distribution_keeper.go
#	middleware/packet-forward-middleware/test/mock/transfer_keeper.go
#	middleware/packet-forward-middleware/test/setup.go
@Reecepbcups Reecepbcups merged commit 55939c4 into release/v5 Oct 11, 2023
4 checks passed
@Reecepbcups Reecepbcups deleted the mergify/bp/release/v5/pr-118 branch October 11, 2023 21:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Reecepbcups Reecepbcups Reecepbcups approved these changes

Assignees

@Reecepbcups Reecepbcups

Labels
automerge backported conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@Reecepbcups